Use add/delete_read_fd in xsmfns to simplify. Also restart with initial_argv.
authorJan D. <jan.h.d@swipnet.se>
Tue, 1 Feb 2011 08:53:03 +0000 (09:53 +0100)
committerJan D. <jan.h.d@swipnet.se>
Tue, 1 Feb 2011 08:53:03 +0000 (09:53 +0100)
commit4817a832f498ad3d296023d6381e8900275135cb
tree491dedc351b3d866d08ee7f4fc2a189171a8988e
parentf45c43c7dbb624b849a11d4dc9e6726ccb139670
Use add/delete_read_fd in xsmfns to simplify.  Also restart with initial_argv.

* xsmfns.c (ice_connection_closed): Call delete_read_fd.
(x_session_check_input): Change args and return type so it can be used
as argument to add_read_fd.  Make static.  Remove call to select.
Call kbd_buffer_store_event for emacs_event.
(smc_save_yourself_CB): Also store initial argv to SmRestartCommand.
(ice_conn_watch_CB): Call add_read_fd.

* xterm.c (XTread_socket): Remove HAVE_X_SM block with call to
x_session_check_input.
(x_session_initialized): Remove definition.
(x_initialize): Remove setting of x_session_initialized.

* xterm.h (x_session_check_input): Remove declaration.
src/ChangeLog
src/xsmfns.c
src/xterm.c
src/xterm.h